Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Sep 2011 19:49:34 +0000 (12:49 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Sep 2011 19:49:34 +0000 (12:49 -0700)
commit93ce4a4c3943e4a82efc3eecc3ee9b9da1241e31
treee182d0f041d3d393710a6e1db4cc2bfb0d9178d6
parent349fa31b221b26338c4808f25265bcc5e995faf8
parentcf4223ba8c46c3f2f4212885aefd1653690ea620
Merge from trunk.